fixed loopholes