Bug Fix. Tested Ok