fixed abstraction issues

also see Drawable#store(..)