notice fixes
notice fix and fixed #17