Fix #55

A quick fix for issue #55