Workaround for issue#3