Dirty Workaround, Should Work Now...