Real fix for issue #1

Real fix for issue #1