Fix from aditional feedback