SW-15 Fixed bug