Fixed #SNAPPEAWEB-59