Drawing order fixed once again