BUGFIX missing typeof's