Fix #436, fix #435