Fixing broken individual steps issue. Closes #405