better code fix