bug with empty bodies fixed