Fixed exception on 1.6.1