Bug Fix and build warning removed