Final bug fixed from inhouse testing