#51 Fixed variable naming clash