fixed bug with master merge