updates #291, updates #300