issue#120

Please consider this small patch as a solution for issue 120.