temporary fix for useless calculations