Fix double declaration issue