[BUGFIX] Epic fail bugfix