FIXED #27 and #38