Import organization code review fix issue #16