Fix default mapping bug

Closes issue #33.