Finally fixed that bug...