Fix for basic functionality.