Fixes a horrible bug...