bugfix layers