Bug Fix. Thanks Leo!