really fixing the bug...