Some fast fix