Fixed #436