Fix #53 - merge lock and visible