Fix for #168

This is a fix for #168.