Fixed one bug :smiley:

This was the main bug, one more remains.