Fixed major bug in layout stop