FIX: Current bugs fixed.