#43, #46 resolved