Workaround for a minor bug