Bugfix: Missed method included, still need to fix bug on client that crash.