[fix] merge #495, thanks @glasser