Imperfect solution - Fixes #219