Workaround for issue 27