Removed buggy PWD check