#55 doman mapping fixes