Fix for weird dot notation behaviour