added backwards compatibility (ugly)