Fix cap's issues