fixed prefixed variable issues