Bugfix for active support 3.x