Fixed disambiguation bug