some fixes for keep, version 4.3