attended comments of @antonio and fixed shoulda