Added ugly workaround...