Workaround for problem