Fix for onstructorcall with access of variable found twice