Added fix for serial manager