Fixes custom properties