Np 2650 fix

https://sittercity.jira.com/browse/NP-2560