Bugfix for 1GH compatibility