[BUGFIX] Fixed overlay behavior

Related: #7, #13