Fix from lucian