#1131 Fixed bug