Added current directory fix

Added current directory fix