Put a temp fix to issue #61

This is a temp fix to #61 

@jjmerino, @kmeurer, @jamesongamble, @suprbh - please review and merge.