FIXED #35, #38, #39