Bug with -p option fixed