Default layer fix

Address ticket #479