Update for Issue #1, Thanks to vsespb.