Reverted generic method, since some bugs occured live.