[BUGFIX] Epic fail bugfix 2