V6.4- Resolved Github Issue

Resolved #281, #283
Testing with different scenarios