Fix for basic level