Fix decimal and negative range