Fix #474
Fix #455