Fixes #4 & Fixes #5 (3.24.00 compatibility)
Fixes #4 & Fixes #5 (3.24.00 compatibility)