Fix #481