Some fix

Perhaps this will be useful.