[core] Bug Fix for window service