Modified to fix spec