#master - fix bugs