Port has special widget fix