Reverted the gnustep commented code. it seems better with the patch, but still buggy