removed hash and fixed integer conversion