Fixed issue with not returning from adapter