Fixing transition timing issue;