Fix for first part