addressing #484