Workaround for part of #78