Fixed Bug with hacky Work-Around