klks bugfix thanks to esmid, added some bounds checking