Commit @e885e108f8137e8111111e9b29f85bfbd8b8399d now works