Fixed buffer issue - at least i hope it fixes this