Mark #435 as fixed