Fixed #502