Fixed #SNAPPEAWEB-1