FOR THE LOVE OF GOD PLEASE BUGFIX