Joey Schulze - 2015-09-21

Problem still exists in rico3, here's an updated patch.
May require fix for rtl case.