Workaround for 0-byte problem