Magic constant - get rid of it