Fix for autolay