Custom fk bug

Get latest fixes for bug