Workaround for issue 23