Alternativ workaround for issue #122