Fixed reassignable reference issue