Think it should not be hard-coded like this