Temporal fix for issue #122