custom fix, proper tests