Bug on getting responses if there are none
Merging w master