Fixed issue with too short of last block (i hope)