Little fix and previous fix on a different place