bug fixes 1511