Bug Fix - Minor