fix objects
first working version