Fixed #2 really