Fix for shapes mixin to support the custom and optional shape-radius argument