Default layer fix

Address #479