Frontend, Fixes #14