Nested fix
Close #35