Right (tm) test provided, fix in attime also backported