Fix for stack/52b417ce7841550ad40d8834 stack/52b37bf17841550ad40d847f stack/52b3099878415511e43777ef