Fixed #67 (with scripting ofc)