Fixed dependency to custom