Better type checking?