Fix #502