Huge fix to make thing works