Workaround for a bug