Fixed empty slots handling (#220)

Fixed empty slots handling(#220)
Fixed scaled slots handling (#205)