Epic fail bugfix