Fix #484