Fix for #153.