V7.4 - Resolved Github Issue

Resolved #303, #306