jacket-3
Fixed return types