Reverted last change, back to casting in constructor