Fixed #589