Partial fix of #128, /core/solution -> /solution