V5.8- Resolved Github Issue

Resolved #252