test issus / fixes