40 Fixed bug