Fix for Alex's changes.