An alternative fix for issue #122