more recent fixes