fixed Theory 2.3