Fixed bug on version 1.15