Fix for #28

Here's a quick-and-dirty fix for #28.