Fix Bug with # #38