Issue #47: Fixed bug with removing photo listener